diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php
index 7bf1160..b402464 100644
--- a/system/libraries/Loader.php
+++ b/system/libraries/Loader.php
@@ -703,9 +703,8 @@
 	function _ci_init_class($class, $prefix = '', $config = NULL)
 	{	
 		// Is there an associated config file for this class?
-		if ($config !== NULL)
-		{
-			$config = NULL;
+		if ($config === NULL)
+		{ 
 			if (file_exists(APPPATH.'config/'.$class.EXT))
 			{
 				include_once(APPPATH.'config/'.$class.EXT);
diff --git a/system/libraries/Router.php b/system/libraries/Router.php
index bbfa0d1..0603720 100644
--- a/system/libraries/Router.php
+++ b/system/libraries/Router.php
@@ -373,7 +373,7 @@
 		
 		$request_uri = preg_replace("|/(.*)|", "\\1", str_replace("\\", "/", $_SERVER['REQUEST_URI']));
 
-		if ($request_uri == '' OR $request_uri == SELF)
+		if ($request_uri == '' OR $request_uri == $this->config->item('index_page'))
 		{
 			return '';
 		}